Track our own recovery

Change-Id: If39ace5f38abbfe1a06cb2271690e20a9b7e02c4