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

Change-Id: Iccb7edfe72fdee6f4feed03d7ed6f16244a3c89a