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

Change-Id: Id38aa32dd7940ee7cfd4e0151ff98a7d94b0bcc6