Refactor to merge builder.go into runtime.go Upstream-commit: e503f6a87802d388cc8c9829c4f1eacbab1a13a6 Component: engine