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

Change-Id: I1edec42d5f033edf9d24446ed1866965a1324274