Merge "Add error reporting mechanism for failing Unwind." am: 3f9c22c34c
am: e1a4b0a756

* commit 'e1a4b0a7569fb8d40b83cdda6edda51824f31026':
  Add error reporting mechanism for failing Unwind.