am 4f18e98e: Merge "Fix LocaleInternalsTest."

* commit '4f18e98ed6890e5de18e04492efd693d19ce7017':
  Fix LocaleInternalsTest.