Merge "Fix conversion of locale from BCP47 language tag" into lmp-dev