Snap for 8736885 from 4e47fd3e7ddc9c0468fb64803280c6f25e42c5a0 to mainline-go-resolv-release

Change-Id: I05911b96eb7051985ba479c1f68c09fb04ab4c9d