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

Change-Id: I745435718ec0370ffe1168c44daeb039949479af