Move recovery init to common

Change-Id: I3e608be54d793a5ee712bdd4872315cf404789d1
(cherry picked from commit e17ee85299ec432f9a414e3fa8ffeaed3e150a83)