Snap for 8349661 from 39ec5f1a3b09152436701de9f0fab44f9e600112 to mainline-go-art-release

Change-Id: Iedea99a55d28116f8d7409efc8989fa15a2c18de