Merge "Add charger_type."