Android 7.0.0 Release 7 (NRD91D)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAlfzAHAACgkQ6K0/gZqxDnii0gCfezU+aCXVJar09UEAZBqOUzii
YEoAnjM+dWvwwuINFC00RhZOC68bs8JV
=oUJf
-----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.