Cleanup client/ package dependencies Upstream-commit: be97c66708c24727836a22247319ff2943d91a03 Component: engine