Snap for 11049560 from b283bfece9d85751ad60b270e31b07bf853639ca to mainline-art-release

Change-Id: I9e98cf7fbcdcb4a8d62ad869b9b247559e9c7748