Merge "Add odm/etc/media_profiles_V1_0.xml" into pi-dev
am: afb0d8c57e

Change-Id: Iab4baa04662b2cce820459d417979433c90cdfbf