Snap for 8736885 from 4dd726e68d5d58f6d8c5a0c006c6f9895eb8cc8f to mainline-go-resolv-release

Change-Id: Ic4d46be6d310994ed378173b5d53ca71f06fc086