am 3891893b: Fix locale unit tests

* commit '3891893bf85d30963caf47a419114349c6520b2f':
  Fix locale unit tests