Merge "Revert "Add EBS interface to BatteryController""