Merge "Revert "Revert "Add locale aware APIs."""