Merge "Fix DecimalFormat related test and code cleanup"