am fdf82f8b: Merge "Fix various Charset tests, clean up the implementation."

* commit 'fdf82f8ba94915a263b418350c3b55ab42002841':
  Fix various Charset tests, clean up the implementation.