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

Change-Id: Ie7d177bfea6d8b4d316460b22af690dc238d36cc