Merge "test: Skip desugar with DESUGAR=false when running tests"