Snap for 11063562 from a37a3793c0b5c5e3a50b714b6d58d709c3045af2 to mainline-art-release

Change-Id: Ia48694e51053bce14898a1c9458776887fb97dd0