am 7866c507: am 6f6d494b: Merge "Improve the dump code."

* commit '7866c507378fbb69ccf5077d3d2586eadc49e56e':
  Improve the dump code.