Merge "Replace sessionStateMap with sessionTokens."