am 06beab87: (-s ours) am 1137b572: am 5388cb5e: Remove deprecated locales - DO NOT MERGE

* commit '06beab874939a4a7723e47979fc2fdc6219257a5':
  Remove deprecated locales - DO NOT MERGE