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

* commit 'cfcf7a4502b44ccce422edb676531cd85ee47db8':
  Remove deprecated locales - DO NOT MERGE