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

Change-Id: I5bf0caf625bd8798e4edef911d29919c577cee6d