Fix desugar on Mac platform builds am: 737bce336c
am: d6b13bfcd0

Change-Id: I276e7d83eb2f18a1fe3bf31570d2b9467e0f106c