Merge "ClatCoordinator: improve file descriptor clean up in error handling"