Android 6.0.1 Release 55 (MXC89K)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAleD3ioACgkQ6K0/gZqxDnjvHACePqjdgx8I12i8gw6LoCm6BtV8
w3UAnAsw7ZZOf9FoQ/jeF65Ibzps87eZ
=UWBj
-----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.