Move api/client -> cli/command Upstream-commit: e345d67c4e2862d497ec92640fd00bf04e6b696e Component: engine