Merge "Remove references to BatteryStatsHelper from PowerUsageBase" into sc-dev