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

Change-Id: I5f4ee3b7e87421d3c329b211d939ab054c72e3e1