Merge "Add new LocaleManagerService and its shell commands"