Snap for 7195589 from 320312cfa6552a909d5ad1450062e0e4a306bd4b to mainline-media-swcodec-release

Change-Id: Ieb077ba6eccdc50553e21fff15225d58659f1563