Snap for 8736885 from 2aaa9747aa9edcf133411e2c7d5d87fd7a50ebdf to mainline-go-resolv-release

Change-Id: Idaf25f203074e2e0f024283a796f9d75780bf219