Merge "Reenable yardstick for virtual deployments"