Merge "Revert "Use the StorageStatsManager in FileCollector."" into oc-dev
am: 864d53d6fc

Change-Id: I21cf2b0a245cfeaf0c788b3c869b441776ec5d0c