Merge change 26288

* changes:
  Cleaning up PipedInputStream.