Merge change 26453

* changes:
  Fix Formatter.format's handling of Formattable.