Merge "BatteryService: add traces."