Android O MR1 IOT Release Smart Display r9 (OIM6.190107.030.A1)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXNB/8QAKCRDorT+BmrEO
eOMnAJ93qNFaxrQXJUaD0ltg9yWNrm7WsACeMQeVum/G6K64XXVXMl5GXKzCj9o=
=Trdg
-----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.