Improve and clean up multi-locale support

Addressed comments on I4ff7e7d51

Bug 26142164

Change-Id: I0cb10d47375adfb8efffb1102adb3daa9043bbf1
4 files changed