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

Change-Id: I828469ce37e797fa81da0620de48d7625d13e787