am af883e17: Merge "Fix LocaleInternalsTest." into lmp-dev

* commit 'af883e176d361b0a58a4ca54fbd206176584cb22':
  Fix LocaleInternalsTest.