Snap for 9885989 from f52a5e89e9d1ddb2c0e0f9db630ac76ed4e74966 to mainline-art-release

Change-Id: Id3e6f17c1d624e39e80852f27d8565a7cbcbf683