Merge "Fix timeout debug print in tests"