am 0c863cb5: Merge "Refactor to share map_info amongst threads."

* commit '0c863cb5848795ac87e62dc34d2eab103c830dde':
  Refactor to share map_info amongst threads.