am f6b95993: am 430d5f93: Merge "Add locale aware APIs."

* commit 'f6b95993486005afb1d53677b321a85870c3b0c3':