Merge "Fix sending of vm_flavor to Robot VM"