Merge "Introduce unique_fd"