am 43e79dab: am 430d5f93: Merge "Add locale aware APIs."

* commit '43e79dab8478fcfadd723a9ba51b7cb07a214f79':
  Add locale aware APIs.