Snap for 8736029 from c8aec5c18160241e9b5bc79bbc3580e13df5ab23 to mainline-go-art-release

Change-Id: I5b33778e5a08293bdf1042fd3ba6ed971bde1b8a