Merge "Revert "Model virtual-mcp11-aio, uses None over List field.""