Refactor builder with new Go interfaces Upstream-commit: 2606a2e4d3bf810ec82e373a6cd334e22e504e83 Component: engine