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

* commit '3e5fc9f7714525960f0118c99de1d5e98b7ecbb0':
  Remove deprecated locales - DO NOT MERGE