Merge "Small behavioral changes to the unwinder."
am: 335675c2fd

Change-Id: I17b0eafc1d3204f697ad31877116819fc138d9c8