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

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