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

Change-Id: I9acfb8e5ffa7512a44c762ff0a1d94e41dcef8d9