Builder: Environment replacement fixes Upstream-commit: e590aa2c7adb1d221619fd3d11079a307827d463 Component: engine