Merge "Media2: Initial commit of Session2Token"