Android 7.1.1 Release 17 (N6F26R)
-----BEGIN PGP SIGNATURE-----

iEYEABECAAYFAliTv+wACgkQ6K0/gZqxDnjhTACffKA+1f/zWDcYtTtcNQmGcvZA
UVcAmwWbWuG1BObnYRTObFGcaWFw3PWh
=/sDv
-----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.