am c95d61e1: am b6943e7b: am fe3a5e88: Merge "Fix conversion of locale from BCP47 language tag" into lmp-dev

* commit 'c95d61e15c33519225e2d89af58aeb9843776e2f':
  Fix conversion of locale from BCP47 language tag