Remove builder dependency from the api. Upstream-commit: a7742e437943bb0c59cc9e01fd9f5e68259ad3ec Component: engine