am d61e769c: (-s ours) am 08767931: am 6bac8616: Remove deprecated locales - DO NOT MERGE

* commit 'd61e769c13b3e0ff13c4cc6cbb2f5d8ea6554217':
  Remove deprecated locales - DO NOT MERGE