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