Merge "Fix NumberFormatTest after ICU56 update"