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

Change-Id: Ia9b7d86185671b31c297363a7547c5e61799f777