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

Change-Id: I726e23c21876e21dd0b4ebebb4ea5f3d58401b62