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

Change-Id: I33fdd31881289fa1646c7d967586ea3860e2dd59