Snap for 8820681 from c25a48c10f4dc1da86c72ab50231097daf4f6a4a to mainline-go-resolv-release

Change-Id: I3221b477bd6d7009aa9eb737b2f950dbf56c2d3e