Merge "Rename Battery to BatteryState." into sc-dev