am 1776f50b: Merge "Change to support new BacktraceMap."

* commit '1776f50b5b99782278d7f3d354fa956d9066c903':
  Change to support new BacktraceMap.