Snap for 8820681 from 83ae8a1b343d909cba81add3b84878260978d42c to mainline-go-resolv-release

Change-Id: I31f57a9f420705a1898569399195115a329955f4