Android CTS 6.0 Release 15 (3666707)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAliaGXEACgkQ6K0/gZqxDnhctwCeI6QWXRh2qCab9v+eHJpNfReW
8nwAn3H5vuEm8AMZZi9M706BPzulRpRm
=LI+p
-----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.