Merge "Revert "Add locale aware APIs.""