Snap for 8736885 from 00d4c39486f5b6c133e5f8ec99af7e007c4e3ed0 to mainline-go-resolv-release Change-Id: I11b30e49e5ff1f352d44521ea731b2ee914da5fb