Snap for 8736885 from 0a3207f08f581da4c6f6520a7d69e7fda17eab2a to mainline-go-resolv-release

Change-Id: Ib9393fa746c0e4415911173f30e0e2cef65528a2