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

Change-Id: I6f945c7a4fbac3f17441ae3fef077f6c71ed30ea