Merge "Change NumberFormatTest to match ICU's behavior."