Merge "fs_mgr: use more unique_fd"