Merge cherrypicks of [14250604] into mainline-media-swcodec-release

Change-Id: I2049906924a51a017a2776d9216e38befe134853