am cbc0db8f: Merge "Switching to use try-with-resources"

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