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

* commit '90e2301e23532c92dd4c24394b7407e243389e9f':
  Add explicit close of Scanner input