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

iEYEABECAAYFAlZpvZAACgkQ6K0/gZqxDnikYgCdF4PLZBG1DLOPRW63ExnA2Phu
GFoAn3T0acxEwL68p+DTystyHiK51VQ0
=+FIe
-----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.