Merge "Fix codec output format for conversion"
am: 21d312e718

Change-Id: I14d72ce984fc13725766cedfb83d2f2f2966e1cc