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

Change-Id: I99aca55a9ae9ffd2c7220885ec033486996b31a6