Merge "Use venv for VIRTUALENV_CMD"