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

Change-Id: I7879f9a88934c8bd192784bf502208aaa6a0b4fb