Merge "Skip when force_tenant_isolation=true and no admin credentials"