Android 6.0.1 Release 60 (MOB30Y)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlefw6wACgkQ6K0/gZqxDnhcJACeNpEHmEAAV0Id3Pd/YqHj+NrT
UoYAn3Ay2nli4GRDx+0CWY7AW4mNzc7M
=AwAT
-----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.