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

Change-Id: I44b8fbb020434d70cbebc57200c9fe5c5c184ee5