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

Change-Id: I80b58e892f8e10f52454f5377daa90b276827f44