am 51fa9b89: (-s ours) Remove deprecated locales - DO NOT MERGE

* commit '51fa9b89899b9af8b53446d9d63a73b4e4316e77':
  Remove deprecated locales - DO NOT MERGE