Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev