Merge "Snap for 8745897 from d198b5a5144605555505e4336306f10eebe0db4f to tm-frc-media-swcodec-release" into tm-frc-media-swcodec-release