am 08767931: am 6bac8616: Remove deprecated locales - DO NOT MERGE

* commit '087679316277602be9b8632250bd81f607558aec':
  Remove deprecated locales - DO NOT MERGE