Snap for 8564071 from 2aaa9747aa9edcf133411e2c7d5d87fd7a50ebdf to mainline-art-release

Change-Id: I2de3c4f9dee5e1b687c600e5acb91a9ba68e3376