Merge "Switch to BatteryStatsHelper implementation in the framework."