Merge "Refactor cross_tenant_connectivity for tenant isolation"