Merge "Fix file descriptor ownership."