Snap for 8512216 from 40ee5730f96f840b1be7cbe8daabddd543eba49b to tm-frc-media-swcodec-release

Change-Id: I33092ad1622687272ba6cf214d537253b7e01444