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