Android 6.0.0 release 4
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlYyY/4ACgkQ6K0/gZqxDnjYZQCfQdMwjgoCLiR66rNV4aXNlJ+p
xhEAn3cluGAI1f9IhrzIUfOPjz3/VPHQ
=FC1d
-----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.