am f6524f8b: Merge "Fix format_number."

* commit 'f6524f8bda87f7d25dad7bed7091a93f3de58728':
  Fix format_number.