am e01e22e1: Merge "Update SORTED_CHAR_MAP"

* commit 'e01e22e1ea2d8fd3e924ce42b40d0500803ea47e':
  Update SORTED_CHAR_MAP