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

Change-Id: I723f632f869fb3cd878fb51db1d88411537112a2