Merge "Add support for the new unwind method." am: 9ccf627e78 am: 61ef596862
am: 8216b64545

Change-Id: I586fa7b51c6ee6d86d2c8f39eaed01e5e49cff43