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

* commit '139f7203e0d8088cca2fa9d0aacaa48c1f31681c':
  Remove deprecated locales - DO NOT MERGE