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

Change-Id: Ie0367be5ff7a56bb7e90a7c9d9db63d0a879f9b7