Merge change 27156 into eclair

* changes:
  DO NOT MERGE: Cleaning up PipedInputStream