Merge "Modernize VIRT_DRIVER=fake usage"