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

* commit '99888374e72a9b7099bdb1320d6cc69f454520e2':
  Remove deprecated locales - DO NOT MERGE