Merge "Fix StorageStatsService#getTotalBytes" into udc-qpr-dev