Merge "Desugar when javac version is 1.7" am: ed44a54991
am: ce9dfdeee6

Change-Id: I4cf83e8ea97a0ebdc8f25d569fd997a01a603a4d