Making sure state is loaded before resetting the auth token

Change-Id: I4c07451cb93cce6008fcc7c23705a813c05bc18e
Merge "Making sure state is loaded before resetting the auth token"