am f5255c2: Merge change 1418 into donut

Merge commit 'f5255c21f4d926849deb8ecfbcd74065bc0b534f'

* commit 'f5255c21f4d926849deb8ecfbcd74065bc0b534f':
  Show locale names in alphabetical order, in their own language.