Cleanup api server creation Upstream-commit: e12572f265383fa64b84c2a13fb1c23abfd7335e Component: engine