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

Change-Id: Iadbf96bfe2391926ab1385ccc4fa915213402f4d