Conflicts: buildfile_test.go Upstream-commit: f712e10cb21d0056593ea23152d347637396c810 Component: engine