am: 549745cc87
* commit '549745cc8778f806e46809e472fbcf3c7f066b83':
Allow recovery to return error codes
Change-Id: I474bc0afb4e92ffafec9de60e1665e3aa3c2cf10
am: 549745cc87
* commit '549745cc8778f806e46809e472fbcf3c7f066b83':
Allow recovery to return error codes
Change-Id: I474bc0afb4e92ffafec9de60e1665e3aa3c2cf10