Remove registry v2 code path Upstream-commit: a76169870043dcaab16f69c3751064857ecb5817 Component: engine