Snap for 8736885 from 58b10f2bcaee58bab920b55bd3393078c4caeb3f to mainline-go-resolv-release

Change-Id: I0ce28723dd1092a925a83d0bf7448290d16a0b26