Merge "Revert "Desugar default methods if required""
am: 4d85d55e09

Change-Id: Ic75942bb987f493cddb5d19ee56e64868336386c