Snap for 8564071 from ee86670715b2f28028e6c270e07dcbd56882c5ec to mainline-art-release

Change-Id: I2c56c7a889d924c0bd3d2ace2bf8d128a522fd65