Snap for 8736885 from 2536fe25a69f90b7c380dc4ddff269403ebe9a0b to mainline-go-resolv-release

Change-Id: Ia97f2b54f7eded64a2f8e6ed8f4e77d22e998579