Snap for 8735767 from f2b91e87199635d3e9038b3db7ade0905007e2e6 to mainline-go-sdkext-release

Change-Id: I312fffd41790c2d6dd5e89cf96112e2067d0b0ab