Merge "Session2Token: Fix issues with TYPE_SESSION_SERVICE"