Snap for 8736885 from 5ace5ab2ad6fe67078ad1f12ec571db5c7f52838 to mainline-go-resolv-release

Change-Id: I00947682f93fb0cf6fff0fd367a4227bf70f451a