Merge "BatteryStats: Fix units on battery charge counter" into nyc-dev