am 7a9b1324: am 4aa0295b: Merge "Remove deprecated locales - DO NOT MERGE" into lmp-dev

* commit '7a9b13241ee64106d9f466c35f43bf76ea446401':
  Remove deprecated locales - DO NOT MERGE