Merge "Remove unnecessary force_tenant_isolation"