Merge "Wrap fd with unique_fd so it won't leak." into pi-dev