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

Change-Id: Iea5f322dc31ce64ee7d75cc74ad7f2f68b1c063c