am 8268a4c7: (-s ours) Remove deprecated locales - DO NOT MERGE

* commit '8268a4c790c65bd281ccddc05d272594e4194431':
  Remove deprecated locales - DO NOT MERGE