Merge "Add method to BatteryStats" into nyc-dev