drivers/battery: Squashed commits