Android CTS 6.0 Release 13 (3530687)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlhITboACgkQ6K0/gZqxDnhhhwCeNB2zo3NP30+J3TLzVF2vUyd2
b9oAniK8OObJvKNs9+BrnPq/J6c3CYWj
=e9Qp
-----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.