Android 6.0.1 release 30
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlcMGqcACgkQ6K0/gZqxDngt+ACbBD3YmnL2v0Kwe3YLvwDqmXM9
nPsAnRgQp/KIO4Refhynpm2d1PGk1xNs
=pj2/
-----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.