Snap for 8505378 from ce46fc3f4b7504d67624f071489cb42b742b8aec to mainline-go-resolv-release

Change-Id: Ifd177dbf8541086f6a489f82500e448864c56de8