Snap for 8736885 from 90d15f2070538919aa2e5ad1287cb3ef189e13b5 to mainline-go-resolv-release

Change-Id: I453e2a88f47d411fb13285404cc4f9312a923aff