Merge "Fix CharArrayReader/StringBufferInputStream overflow"