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

Change-Id: Idbaa19c37c4e05af554f06725612750365a4ca63