am 07c6fc5e: (-s ours) am 306bc728: am 575bd810: Remove deprecated locales - DO NOT MERGE

* commit '07c6fc5e9bdca3c1caf254e5727b83259607fde8':
  Remove deprecated locales - DO NOT MERGE