Merge \\"Add lock when iterating over BacktraceMap.\\" am: 58c0b44694
am: 91186e8ddb

Change-Id: I738b33db4c68240aa1b814b01bf283097d2a2f26