Snap for 10453563 from b43d22ee9896ec1156c8320436d562dd37d44a43 to mainline-media-swcodec-release

Change-Id: Ia7f54d3a3741f39ebd702f42f453e3663922a56e