Merge "Modify to use new BacktraceMap iterator."
am: 6ce6cdb0d5

Change-Id: I80f35b62d11b4232e856b3918d3707962327da94