Snap for 8736885 from 44b5d5b5c3387292401baa37f22bd2f0c99f9e45 to mainline-go-resolv-release

Change-Id: Id16b570d0c463b65605de7dd1f607b18fe7bcab6