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

Change-Id: Ifde113627a144dfe3837deea409fe6b1016ed27a