Merge "Revert "Remove desugar support""
am: 7302905413

Change-Id: Ib11c8bdc42a10cd67acadc33934cc37482959ba6