Merge "Remove hardcode from virtual-mcp11-ovs/drv models"