Merge "Snap for 8748865 from a0659023d70e26fbca81ed2f0baf0ddd02c4551b to tm-frc-media-swcodec-release" into tm-frc-media-swcodec-release