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

Change-Id: I5f48c1fff19279d46363caf387817204e1b07f95