Sort i18n messages

Change-Id: Ic736fd63aa76c324edb67b303aadb269221ab213