am a9f5677c: Remove deprecated locales - DO NOT MERGE

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