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

* commit 'ea04b5a6d9fbbc3877446f47a50b3070da1e036e':