Android CTS 7.0 Release 6 (3670477)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAliaG2gACgkQ6K0/gZqxDngUMACeOXP9JXK2J/jEfJ7fNra6e7f/
h3YAnj14otAVfgWOCfPmKXeBIhnnmC3Z
=xqTO
-----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.