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

Change-Id: I9787a4f6c6f8a5147fa46d6e05b3ca6e10243efa