Merge "Handle recvfrom() returning 0." into nyc-dev