am e70a1d77: (-s ours) am 60381093: am 2400b2c3: Revert "Update the media_profiles.xml file to include..."  do not merge.

* commit 'e70a1d7725a7f83c9aa823278b2532e95d3c22b8':
  Revert "Update the media_profiles.xml file to include..."  do not merge.