Android CTS 7.1 Release 15 (4607299)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWqcK/wAKCRDorT+BmrEO
eHkgAJ95FZHb0bNAopEAG4IsVbTNbfwr0wCfVBlQ8LDopjL/u6GoNw7xM/Ss9VQ=
=j5VA
-----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.