am 0c437fd3: Merge "Add appropriate casts for char16_t."

* commit '0c437fd3a79ba5f9118ec10940a3398665690587':
  Add appropriate casts for char16_t.