Minor tweaks to quotes in env vars Upstream-commit: df3c4254072d110ecfcefeda94279c25e6a9f334 Component: engine