am 8573fd88: (-s ours) Remove deprecated locales - DO NOT MERGE

* commit '8573fd886fc4776e3edaaf68fffe3ee51c7ec257':
  Remove deprecated locales - DO NOT MERGE