Merge "Adds protocol options for test_cross_tenant_traffic"