Merge "Fix a typo where BufferedReader refers to chars as bytes."