am 69d7dcba: Merge "Read from disk with a BufferedInputStream."

* commit '69d7dcbab69c474129bd355298263d729d464f25':
  Read from disk with a BufferedInputStream.