Snap for 8736885 from 8f1564262a5d3b1638d877319ad5aa3e88e02724 to mainline-go-resolv-release

Change-Id: I4519dfdb16239aa3a416541e5c4adba95219bbe4