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

Change-Id: Ic4504fcbba2b99065f854cb075b4c94598d6857e