Snap for 10453563 from 1d278a6e974b1a67bf6e9b073eedc70c4a55d20c to mainline-art-release

Change-Id: Icd067c7236e57e7015f035dad102fbe01a132cbe