Merge "Remove unused tenant_id variable"