Merge change 26247

* changes:
  Consistently use Formatter's cached NumberFormat.