Android 8.1.0 Release 25 (OPM2.171019.029.A1)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCWuiltwAKCRDorT+BmrEO
eD0rAJ4wiFbmzu6cdUCEiwWbKJ5cvNHnfwCeOSRtmSq2FV8H/Y8vGx+yBvmruFg=
=eaZ4
-----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.