Snap for 8736885 from 8bb3da0a2411e61caaa9d9bcfc994c3c69f9e21d to mainline-go-resolv-release

Change-Id: Ifc941395e69e121a1d21ad0bd69865e39795da88