am fc5a93f7: Merge "Fix incorrect parameter types for locale funcs."

* commit 'fc5a93f7a2ea2be740f2c909e8a6a192fa65adc8':
  Fix incorrect parameter types for locale funcs.