Merge "Remove hidden API in Session2Token"