Snap for 8736885 from 48aa238bebcd2bd8b88cf1a476a5bde8c4cd5796 to mainline-go-resolv-release

Change-Id: I85e78a164207831d80114c8dbf82b098767f4ce1