Android 6.0.1 Release 70 (MOB31H)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlf0LlgACgkQ6K0/gZqxDngrjQCghn0M195dWDuz6ctQ4Wu0AF8b
D9YAn2rX66mq7YcleT2/2QvklVB+cr9m
=GtuM
-----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.