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

Change-Id: I708bd4218372b6d008f40df6fada92b601586a01