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

* commit '37f09d6d2ea329984a3182b99a38f170dc86661d':
  Revert "Revert "Add locale aware APIs.""