Snap for 8736885 from 2ffd44fb8d76df8c5e0f9832bc8e731c842f2d03 to mainline-go-resolv-release

Change-Id: Ib47e4938e74761e6c690d56e1eff1c82652908a7