Merge "Add support for the new unwind method."
am: 9ccf627e78

Change-Id: Ie03fea9039dba17957a47edbc6d79e9c0727c86c