Merge "Remove DANM TenantConfig creation"