am d9c5ba0e: Remove deprecated locales - DO NOT MERGE

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