With streaming output of the build changes in 1030 are no longer required. Upstream-commit: 1104d443cc49fd2a6b9c94a2c9724468f9860799 Component: engine