Merge "Use the StorageStatsManager in FileCollector." into oc-dev
am: 4e9002e69a

Change-Id: Ief5f223fd09e6cb78e903276a2270c6fbae2e0cf