Move recovery init to common

Change-Id: I6acca8fccadc5493bd561dbb3d0586a87b26f209