Merge "Fix a testcase in InputStreamReaderTest."