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

Change-Id: If0e432d6daaccae39f270e366306e485217220bd