Merge "Update the Unwinder object and add tests." am: 9e6c11da18
am: 18d4e59725

Change-Id: I3f56769370bed544829cb028d1171ec4a6e7268f