Snap for 8349661 from 8466ade7f9fce92bb1ef8c6fd3dc01968bdf68b9 to mainline-go-art-release

Change-Id: I9829ea59d89cb6a157e832a0ac00a9ed6ee8280f