Merge "Fix showmap SIGSEGV."
am: 8a72d54a4f

* commit '8a72d54a4f6636734f1f6a8a9d76022829f2001a':
  Fix showmap SIGSEGV.