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

Change-Id: Iffae3c2c54a88524cbba931d4d87c209020b1488