Merge "Handle EINTR from sendmsg/recvmsg" into oc-dev