Merge "Follow rename from removing desugar support"
am: 342e59c5a0

Change-Id: I600651a655e8ab01402972b173de07515b123db4