Snap for 8564071 from 44df165bb7c0920046744f1b45d684fb84b62130 to mainline-art-release

Change-Id: Icd9fc0b84409d3bc3842e2721318527df374fea1