Android CTS 6.0 Release 16 (3736419)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAli4siAACgkQ6K0/gZqxDnjINwCgjeIxWm9AFvfm5s/3HwWuaAT+
IaoAnAoZZnyuKeRdn/8wP7CnTbJkXfhE
=2541
-----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.