am 7a4dd551: Merge "Flush the auth token table on resetUid"

* commit '7a4dd551344cd36954f57aab2f0eaa0a20ba6625':
  Flush the auth token table on resetUid