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

Change-Id: Ia7ed006e78fb5de690129a94cc248d092d7623c0