Snap for 8902501 from 4cc1c435f8b89ad989b9d993826997559c2b892a to mainline-go-networking-release

Change-Id: I3e0db9b24d42b5fc1a0d9121bd9083e22dddc849