Merge "Disable desugaring try-with-resources" am: 28794da1c0
am: e99de69665

Change-Id: I77037408e96141f500b40bb0cee7aab7305d35dd