Snap for 8736885 from 7771b626ec751b7c219f74b4298f4efc5557dbb4 to mainline-go-resolv-release

Change-Id: I7b0d6e171dcec3eb6417fba74d4798bc9fb3af13