Snap for 8857176 from b974de6b8bceb4c033126b0139807931d57a3662 to mainline-go-resolv-release

Change-Id: I734973be2b597edbab512849c9562cb6f1ef9571