Snap for 8736885 from 0674b7ccb3dc02466e0e08da28693d04b56f6a7d to mainline-go-resolv-release

Change-Id: Ibaaff0ed2a97e5aad75b1dcc92a4c65b445d7663