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

Change-Id: Iaff1ab9d8d08848773d66303cd352fe761d138ef