am 320b233c: Merge "Remove HistoricalCharsetNames."

* commit '320b233c17ee4c743176e6ae2ace4825d1c0e1d8':
  Remove HistoricalCharsetNames.