Snap for 8736885 from 2a92d7a0bac4c274ed9753fdb51099c81004a0ce to mainline-go-resolv-release

Change-Id: I711d8d666d4ab8221088484f41be757a37feaa23