Merge "Add HAL changes for EV_CURRENT_BATTERY_CAPACITY"