Android 7.1.1 release 13
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1

iEYEABECAAYFAlhul1MACgkQ6K0/gZqxDngh4QCfYTac1ma7eSZbYjQskqw7/IRO
sY8An31RlqlQFICgyveeKmA9rWUp0uJD
=7R9w
-----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.