Snap for 8820681 from 9af1d3d6697162317dba13b5b0fb0776e4ca1e53 to mainline-go-resolv-release

Change-Id: Ib33480cc42027a331be6fafa7e976cc70006ddbe