Merge "test: Skip desugar with DESUGAR=false when running tests" am: 8d80bba69c am: 578e00075d
am: f29c813936

Change-Id: I6a5b79025aeec2caba0e2dca11aa2d5a23e36e5f