am 6c668264: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev

* commit '6c668264ae22e664bbe28502b28bb82113452390':
  Remove deprecated locales - DO NOT MERGE