Snap for 8603505 from c5d7818747105486d5e7b6a8647a69d6d87e450d to mainline-art-release

Change-Id: I41846747b2deb9e42d14da846bead83f0ed27100