Merge "Snap for 8745897 from 169ee4dfa6915590e1cf88116034d66be13a09ca to tm-frc-media-swcodec-release" into tm-frc-media-swcodec-release