Snap for 8505378 from 1b5bbd0ff5303bd6dda6ea31e0f4ce16b68f0912 to mainline-go-resolv-release

Change-Id: I93e6c47e9e561a9d42dcda92f5fbf1c285ef03ca