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

* commit '418fdef2e7299fbf3d7c06319711b84a58423c2a':
  Revert "Add locale aware APIs."