Merge "Remove any reference to "tenant_id" in network"