Android CTS 8.1 Release 12 (5131724)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXBAKvgAKCRDorT+BmrEO
eOROAJ0TJgo6bgvybG2Llg1XnD++Dl+ZFwCfVEml8T7DFgZAQiZcrwbUWXCNBqo=
=odzS
-----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.