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

* commit 'b6459ff653c7824712dcf8a6635d3ffc1ac63e6c':
  Fix LocaleInternalsTest.