Merge cherrypicks of [14241638, 14241639, 14241695] into mainline-media-swcodec-release

Change-Id: I8ed164e03a7973359c4ee05c28c25f2e52fcc754