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