am 5b588540: Remove deprecated locales - DO NOT MERGE

* commit '5b58854084fcb259ca746d5334506ffa77c3a6f6':
  Remove deprecated locales - DO NOT MERGE