Merge "batteryService: Add Charge Counter." into nyc-dev