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