Snap for 8736885 from 3dc30e23e1f24a7cf8862f6fed1166a68ddca94d to mainline-go-resolv-release

Change-Id: If4baeb0f5c36e59882bd007557e9e2a97bc432f9