Merge "Re-enable GLOBAL_VENV"