Merge "Wait for tenant VM netcat server start on fast setups"