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

Change-Id: I7369d1089ff5734bb69ad8add610c0790b797e7b