Android 7.0.0 Release 12 (NBD90W)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlfz8NgACgkQ6K0/gZqxDnjD6QCdGWkX7X9UGCSRb8Ucr/OXj9a5
zQIAnjnt4+Uay3krqNBqZKUllbp7wwIc
=Thec
-----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.