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

Change-Id: I6c2165f87eed7cbe4e66f3ee4a97bed3ac70e98f