Move recovery init to common

Change-Id: I3e608be54d793a5ee712bdd4872315cf404789d1