Snap for 8736885 from 710e5b908991f74c87135b51ab13b053277a8fdd to mainline-go-resolv-release

Change-Id: Ia93ed951a681ad4a44297c42ef5cc1a9cf5d92ba