am 37d7fdbb: Merge "Maps output now marks the fault address location."

* commit '37d7fdbb7491aa91b56035285cb56c0630dd5909':
  Maps output now marks the fault address location.