Move recovery init to common

Change-Id: Ib2630a0e57ec5e088a853641b199489c8e46e872