Merge "run-test: Fix bash warning with DESUGAR=false"