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