Merge "Allow multiple threads sharing a map to unwind." am: f819c1d94b am: 19b90d2092
am: a2939f0f0f

Change-Id: Ia7c2bdcb095e3b47acc19e80a234d41418a9986c