Merge "Revert "Add BMS as a Battery type""