am d4dda2b8: (-s ours) Merge "Switching to use try-with-resources"

* commit 'd4dda2b8c4c3b0309ed668060247ce601808532f':
  Switching to use try-with-resources