am 9b6836aa: (-s ours) Remove deprecated locales - DO NOT MERGE

* commit '9b6836aabee945b6c7a54796a4e6a7ae735f423c':
  Remove deprecated locales - DO NOT MERGE