Snap for 8736885 from 7a321c53da653c64808f012dd163535d8096012d to mainline-go-resolv-release

Change-Id: I0a61e56e54498c2efaefbc06bf074fa8f093c18e