Merge "Remove /extra/vif_port_id usage"