Snap for 8736885 from f4aff9f4d67ecfc40609969f625bd182b5bb3885 to mainline-go-resolv-release

Change-Id: Ida7358e35ceceebd910cad4e1c323771360d10bc