Merge "[MS24] Remove FileUtils.sync dependencies"