am d2a11d97: Merge "Add explicit close of Scanner input"

* commit 'd2a11d97a94bed18629bded429f118f57f4f7821':
  Add explicit close of Scanner input