Snap for 8736885 from 02c6f7e3c7f611831a0d029baae07f4f7c357091 to mainline-go-resolv-release

Change-Id: Ifc1ccbde976691261681f35197f6bd9f5b0a1ffc