Merge "Fix redundant set codec preference to native" am: 035a6f59dc am: 0d413eb0a0
am: c7088874f6

Change-Id: Icbb30540db9c1a9bd3a0bd9b41562cafa4718750