Merge "Fix and reenable DecimalFormatTest"