Move some `api` package functions away Upstream-commit: d311a3a681f918906249a1678eab0136ac663f6e Component: engine