Snap for 8857176 from 1ce5be5b7d6e5e8b0634492723ca57fd3bb86e83 to mainline-go-resolv-release

Change-Id: I7f46307f04fb31b434e7e5ae6bd21f55f9d4e135