am 68cf52ad: Merge "Clean up & fix PipedInputStreamTest."

* commit '68cf52ad370bed0652d50feeda8f56f044e0874e':
  Clean up & fix PipedInputStreamTest.