Snap for 8736885 from 59ae6f320e03327a0e48d5646e0ea55f3dda3673 to mainline-go-resolv-release

Change-Id: Ic68884ba33b06d4719b48cace722dcc5df750a0e