Merge "Revert "Introduce unique_fd"" into nyc-dev