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

Change-Id: I0ceeaf2e7bd8b52a07bdee09c4040ec4d7a14f5b