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

Change-Id: I7a2cc4e68763667fd7695ad8d520419592ec43e6