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

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