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

* commit '505425c0631585a943de164a051bb6a83fd1ffec':
  Add missing "try ... finally" safeguards

Change-Id: I65dd9d226f759b997e548186d5c3c8c85eb44da2