Android O MR1 IOT Release Smart Display r8 (OIM6.190107.025)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXKI+5wAKCRDorT+BmrEO
eKJRAJ439TRG1NJMFjFUOm7bfHEPlLeHeACeKWDKTdUawsRABV2z2Knl0yXNBhY=
=DdHs
-----END PGP SIGNATURE-----
Android O MR1 IOT Release Smart Display r5 (OIM4.181017.001.A7)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCXBYMZgAKCRDorT+BmrEO
eFaYAJ9ZotkqEyWnxcn3jGSOhy91Z/lThACfU/e/1I2dh39D9lqENrDpheZtdac=
=SJ0e
-----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.