Merge "Fix incorrect parameter types for locale funcs."