am a684d9da: Merge "Refactor dump_memory function."

* commit 'a684d9dad58eaac4d4833321ae92e7327057f18b':
  Refactor dump_memory function.