Snap for 8564071 from 3a165cd5fcf97ca2405b5dfa46716b18df9a6cb3 to mainline-art-release

Change-Id: I873850c57184ff15e505d8698517d81ac8c8cd18