Snap for 8820681 from 65cde24694b87599f693be7041e28c7538f2c66d to mainline-go-resolv-release

Change-Id: Ib2416baa3112daceea3a29cd9ae46d9e8b095f60