Automatic merge from submit-queue

Fix cross-build

**What this PR does / why we need it**:
The cross-build was broken by the following PRs:

https://github.com/kubernetes/kubernetes/pull/51728
https://github.com/kubernetes/kubernetes/pull/51557

This PR fixes the cross-build rather than revert them.

Fixes https://github.com/kubernetes/kubernetes/issues/52074

**Release note**:
```release-note
NONE
```