Snap for 8622569 from f15dbd5d1f7d945fc01ff1d660a44455de5287ed to tm-frc-media-swcodec-release

Change-Id: I6381a27ee6a75a3eb0b805ad9047bab7634d68d1