Merge "Fix SIGPIPE errors from drmserver" into nyc-dev