Merge "Add support for the new unwind method."
am: 172b1d0008

Change-Id: Ia42e055e36053f8618dc0e2c13c2cc84bc1a148d