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

Change-Id: I11d4cd7a4acb384c3a4d134d55d8630de24ce533