Merge "Change to support new BacktraceMap."