Android N IOT Preview 2 (NIG40)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAli136EACgkQ6K0/gZqxDnh4vQCfYR2oajUutuqt92J8V64koUzJ
i/AAoItl1O0OpjVV/Vvbh4OAUDKkzDUX
=jtFv
-----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.