Snap for 8736885 from 67cd98578ab05d00fb081e451b3ec5fae2706e4f to mainline-go-resolv-release

Change-Id: I6a6efce9bc63a97733e302e313e2649e89a63b08