Snap for 8736885 from 7e486cb657c3ae0f79f77d3d0d93cb7c027919e3 to mainline-go-resolv-release

Change-Id: I355bf7dee7a268291454170e80c55f3ea380b0cc