Snap for 8736885 from 4e301bcda70be7095d0d88a211f4b4c4e911a420 to mainline-go-resolv-release

Change-Id: I036d26c2a32ada940eb34e54d24853d116aee6ab