Snap for 8736885 from b0d9e2a4b254a0b18ccc4d04bc16592aff90c56b to mainline-go-resolv-release

Change-Id: Ib607eab8c4d95f928116a8fc93975e2063d20b3b