Merge "Stop assuming language part in locale string is up to 2-letter" into lmp-dev