Snap for 7272189 from d91c2673aef4bb4b5faa85a7de3c424ebb6ca604 to mainline-media-swcodec-release

Change-Id: I65b9db3ea7bbc3afe22db18872ec21bc0e2ef25d