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

Change-Id: Ib6285bf8fa8cccba5200d0af9bfb4940a102f254