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

Change-Id: Ic933753b50497ce903fd72030e00bd251dc4cafc