Automatic merge from submit-queue

Refactor unstructured converter

**What this PR does / why we need it**:
See #48039. Makes it impossible to misuse unstructured converter.

**Which issue this PR fixes**:
Fixes #48039

**Release note**:

```release-note
NONE
```
/sig api-machinery