Merge "Add support for the new unwind method." am: 172b1d0008 am: 0d35dffc18
am: 88636a05ad

Change-Id: Idabc050663067baedd84578d24a057775b97af9d