Snap for 8736885 from 3194ed7fc8b659d00e0bc363f51bab8f686fc4e2 to mainline-go-resolv-release

Change-Id: I953db71582edf21c5a999725f839e87ed668fd41