Snap for 8820681 from 0b7fcc11ac3d6cfca4e77f96b55b47232fcece82 to mainline-go-resolv-release

Change-Id: I0e7ebbf03dd9fbc6a85814b8c869b8b874fc074d