am 46021d0a: am a684d9da: Merge "Refactor dump_memory function."

* commit '46021d0a18fc8cee198714c1c939be79ad8d440e':
  Refactor dump_memory function.