Snap for 8736885 from 52d28f0aa58271e0ec8ba83b88d2a2a6842a2273 to mainline-go-resolv-release

Change-Id: Ieed28de25208cbeac18f27349159cb78f0622722