Merge "Implement StorageStatsAugmenter for storage info." into sc-dev