Snap for 10453563 from 8d5268645dc18eaa32271113df3b921073778da2 to mainline-media-release

Change-Id: I7d22d45f5ac4231491c9928f5ae030d6ba3116f5