Merge "Fix the 3-parameter formatNumber to correctly handle IDDs."