Merge "Revert "Add support for the new unwind method."" am: 0d2cac9ea8
am: ce7c7c04d9

Change-Id: Ia61d452721e9ec76823cf766a738f53ccd9b2c37