am d96f2e71: (-s ours) am f784436c: am 5b588540: Remove deprecated locales - DO NOT MERGE

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