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

Change-Id: I11e8530a437d518b9537414a836f1d7f7405e0c2