Resolve ambiguity on registry v2 ping Upstream-commit: 9de604ad68033d08721ce61db7300cee338837e2 Component: engine