Android CTS 7.0 Release 2 (3340807)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlgROkEACgkQ6K0/gZqxDngaJwCeLsrB247nf6UNDu3zez/ACWN8
z80AnjeX6GU5FNzNnZ+0h63pHf5InxNT
=XwRe
-----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.