Move recovery init to common

Change-Id: I8210a5c68f4f8e19ce69dccf9ce87e9bd41b5249