am c0afc23e: am 37f09d6d: Merge "Revert "Revert "Add locale aware APIs."""

* commit 'c0afc23e26ca0a591dd8fb5fcddf1cb616bd5e43':
  Revert "Revert "Add locale aware APIs.""