Merge "BatteryService: Clean up init logic."