Merge "Add missing "try ... finally" safeguards" into nyc-dev
am: 0810732a2a

* commit '0810732a2affee7264d12b73fbcfa82d0db991b4':
  Add missing "try ... finally" safeguards

Change-Id: I29408abab67992b5d33684254c1d7ea7abf34e33