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

* commit '4e89c5c1cafd56191f270f493cfd1c0e8acb3544':
  Refactor dump_memory function.