am 33ac0dfc: Merge "Replace sessionStateMap with sessionTokens."

* commit '33ac0dfc9f9480b71aa45436807682219e3e160b':
  Replace sessionStateMap with sessionTokens.