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