Snap for 8736885 from f9ada5d28146b6d36242701aba44e1332b912b3b to mainline-go-resolv-release

Change-Id: I080515e59f0e4b8e2f59b4ae76f0a2dd7098b5cc