Snap for 8902501 from c99754ef8addff057b67e43e89f14da28b1f39b8 to mainline-go-networking-release

Change-Id: I42b11d2621bbad80c14f99c30200a656d421ac6a