Snap for 8736029 from 52f1a104981757b44fd5134d563ea0f0a158dab4 to mainline-go-networking-release

Change-Id: I16002e76f5b03b784a9df54e6df21ed040e56b14