Android CTS 6.0 Release 17 (3866870)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAljdo0cACgkQ6K0/gZqxDngQ8QCdH0MMnp9mLcsRYRgAWK/WnOWq
32MAn2kjeoPz9d9GLMzZQ9KOYQyVlmKX
=nUy1
-----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.