Snap for 7474514 from a2707050575cdf1c3a3519c0a6bc0535a581c6a1 to mainline-media-swcodec-release

Change-Id: Ie4258e85da7b5a9a5018f5e7108266ab868557fd