am 7a85d9a1: Merge "Revert "Add locale aware APIs.""

* commit '7a85d9a1de7f0970af19eca5f3ca6938cbc2ce95':
  Revert "Add locale aware APIs."