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

Change-Id: Id59faa10e53f41829760cbba76b08968c45132b3