Merge "Add a skip check to make sure that vlan is actually in available_type_drivers"