Snap for 8736885 from 0899a09b09a65f576a372db1c50c2f3c0bd36aa0 to mainline-go-resolv-release

Change-Id: Ib738ad388a874721296cc47d8f63f9f02a8ee2d3