Merge "Fix FD ownership issue in test"