Merge "Remove fs_mgr_wait_for_file."