Android CTS 7.1 Release 3 (3764431)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAli4twcACgkQ6K0/gZqxDniIowCeJ/7Tz+P4pPiIESu7vqPwAWFi
LkMAn2hGUizWelOf1+rlX9AX7O+Mc6a4
=2+Lq
-----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.