Snap for 11391017 from 511827318ffd7c866ec917f128f4901124700823 to mainline-media-swcodec-release

Change-Id: I673bb59e1c00aab13e691ddc4b601bc537e47166