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

Change-Id: Idd4a03c69565e2a144678fcc30e39e4fac67012f