am: 50f64173 * commit '50f64173': Allow recovery to return error codes Change-Id: I4613291b3b4a0c34d5e6999f240465237472302e