Snap for 8736885 from 287db7598d91803ce1277d654aab5eca22b9c4d1 to mainline-go-resolv-release

Change-Id: I175794995266dd47f4b2826e74896371e78bb1fa