Merge "Add support for the new unwind method." am: 9ccf627e78
am: 61ef596862

Change-Id: Ia13d7a19837313eccabb7c0fd84eebb5a7ae5236