Merge changes from topic "media2-stub"

* changes:
  Move Session2Token to media apex
  Add updatable_media_stubs to prevent private API use.