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

Change-Id: I1fef52e483d92cd12f895c277177a70ee9edcd51