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

* commit '430d5f93ceea2e5172144a05885c295dca51b876':
  Add locale aware APIs.