am 1137b572: am 5388cb5e: Remove deprecated locales - DO NOT MERGE

* commit '1137b5724b95caab1b91368a8957d8fffeaf004e':
  Remove deprecated locales - DO NOT MERGE