media_profiles: amend merge

Change-Id: I68703213e35fa9a8882980eade330a0dcf2a6b46