Snap for 8736885 from ff9e945e1b5b5966cfc75b3c954e62076ea9ea00 to mainline-go-resolv-release

Change-Id: I9bf0415e3fe11098ae61b462d15eb36d5f243bf9