needed for #49251, but opening as separate PR to verify if it works without those changes as well.

New flakiness, or legit error? Looks to have failed for two separate runs;

• test / test (snapshotter) / integration (ubuntu-22.04, firewalld) (pull_request)
• test / test (snapshotter) / integration (ubuntu-22.04, rootless) (pull_request)

=== Failed
=== FAIL: amd64.integration.container TestWaitBlocked/test-wait-blocked-exit-zero (10.36s)
    wait_test.go:95: assertion failed: 0 (tc.expectedCode int64) != 137 (waitRes.StatusCode int64)
    --- FAIL: TestWaitBlocked/test-wait-blocked-exit-zero (10.36s)

All green now, so looks like racy tests

Actually we should probably merge this alongside the v1.7.25 change. The deprecation warnings you saw there fix a potential case where the protos were registered in two places if you had a <=v1.7.24 import alongside the 1.8 API.

Ah, that makes sense; I can move the other one out of draft; it's just stacked on top. Let me do so!

So we should merge #49251 instead of this one? Or in addition to?

LOL; I wanted to say "let me close this one otherwise it shows up as "merged" because it's the same commit 😂

2 for the price of one 🎉