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