Android CTS 6.0 Release 12 (3417974)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlgaJ5gACgkQ6K0/gZqxDnjIaACfe+9lADdVJ1aqWBrRyP7Ek+TA
V7cAn11mNsgZCl4EXJNHK21ZFd24T75Z
=pGmJ
-----END PGP SIGNATURE-----
Merge "Google Login - when the datastore is corrupt (i.e when the set active user is not a logged in user), an exception is thrown. Fix this by properly logging the error and setting no active user." into idea133
automerge: 507028e

* commit '507028e964c7cbc448cc7273daf5017a3d2fad9f':
  Google Login - when the datastore is corrupt (i.e when the set active user is not a logged in user), an exception is thrown. Fix this by properly logging the error and setting no active user.