Merge "Add charger_vendor type"