Merge "Revert^4 "recvfrom should set srcAddress for empty packets""