Snap for 8736885 from 3833eedd4cc878745e4686d760804c3fcc895f2b to mainline-go-resolv-release

Change-Id: I0bf1174b9f566bd58a182d62dd55b733cc8a417a