UPSTREAM: 45864: Fix unit tests for autoregister_controller.go reliable (commit: 5c60294)
UPSTREAM: 46510: remove duplicate, flaky tests (commit: c0a58d8)