am 6e59a67b: (-s ours) am 80e99ca4: am a9f5677c: Remove deprecated locales - DO NOT MERGE

* commit '6e59a67b7515d5c52cf8b974c7d451af60c8566f':
  Remove deprecated locales - DO NOT MERGE