am ad3ebcbd: am ef83a2eb: am e01e22e1: Merge "Update SORTED_CHAR_MAP"

* commit 'ad3ebcbdd3c75654c40706e4c1111a544d56d466':