Merge changes from topic "media1_aml_draft"

* changes:
  Commented unresolved hidden API usages
  Initial checkin for moving media