am e5110fd4: am 320b233c: Merge "Remove HistoricalCharsetNames."

* commit 'e5110fd4c21fcf6dfe3253d989d40b747d8e7ef7':
  Remove HistoricalCharsetNames.