Merge "Add another test for the CharsetEncoder bug."