Merge "Revert "Disable NumberFormatTest#testMonetarySeparator partially"" into main