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

* commit '7420e4247b897a723c6a04c05e70eebcd556af8d':
  Clean up & fix PipedInputStreamTest.