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

Change-Id: I316a2c994793230d0496fca5f042356d00ffecbd