Merge "Add media_profiles"
am: 9e2430163f

Change-Id: Ic807ca822abd638c51807ee8a917086c1bb527da