Snap for 10453563 from e7a2c2628cfe6bd7de827397d1ba2596f9f98014 to mainline-media-release

Change-Id: Ib18d6b07266b7783bcd2db9460ed93d54c1a24b8