Merge "Remove HistoricalCharsetNames."