am 94fc61e2: am 4f18e98e: Merge "Fix LocaleInternalsTest."

* commit '94fc61e248aeb44e946139177699d5e87901b4c3':
  Fix LocaleInternalsTest.