Snap for 8736029 from c360838c414f7a198a1fa2750fc52f6bc92e2cf7 to mainline-go-networking-release

Change-Id: I42c045b524148d94eeb0bcbff6eb7628cddb99e5