Merge "Add a new unwind method on error." am: 9b91324cb0
am: fb8ea2626b

Change-Id: Ie444adce663073d03c746fdef0e9ea274e0b09e4