Android CTS 7.0 Release 12 (4215243)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlmEr9AACgkQ6K0/gZqxDni+kQCeI1RLT6AB2w7tExKG1f2bE8Y/
Br8An1Guij5H0vgK6Wdt//+XIFXByAo+
=IZs8
-----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.