Snap for 8736029 from 2aaa9747aa9edcf133411e2c7d5d87fd7a50ebdf to mainline-go-networking-release

Change-Id: Ia2e8cbf0eb4e69b069df0d7dfa4c5953b0ff4dc5