Set APIVersion on the client, even when Ping fails Upstream-commit: a41caadef0 Component: cli
a41caadef0