Snap for 8346638 from c82b508c1f71f9d2ffdb5a68405eb1db20eae940 to mainline-go-art-release

Change-Id: I075b262918fb61a3c9fca4b0380388c840078d19