Merge "Increase guest os ready timeout"