Looks like we try to override the session even if we don't auth, let's not do that. Change-Id: I520c3d020e3415c5737af7912bddf34931190d65 Closes-Bug: #1748751 (cherry picked from commit f5816f1d79)
f5816f1d79