Android n-iot-release-smart-display (NIT1.180611.004)
-----BEGIN PGP SIGNATURE-----

iF0EABECAB0WIQRDQNE1cO+UXoOBCWTorT+BmrEOeAUCW1tS7wAKCRDorT+BmrEO
eBHOAJ0S54QwNY7+HIYo+ITlVcz2p81gpgCghD4reNo+dGdY0pIagRXebcYy8eg=
=d04y
-----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.