Move recovery init to common

Change-Id: I62c2ff6ec3d9396274788b20517fb6dde62c4047