Snap for 10620181 from 1d336944257fce086ce3e1efeddfeaea55c1f0d0 to mainline-art-release

Change-Id: I1a885caaa8c8b985784f9125afb4227c9b2a1aab