Snap for 8736885 from 972e525380b13c2bafeab9bda3aa87852686a21c to mainline-go-resolv-release

Change-Id: I943c51b9e863557f77a129a56107430ed21ab833