Merge change 27159 into eclair

* changes:
  DO NOT MERGE: Cleaning up the PipedStreamTest