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

* commit '4aa0295b355ce17e2da195907ea5dc0322837351':
  Remove deprecated locales - DO NOT MERGE