Merge "Fix TenantNIC and PublicNIC config"