Move recovery init to common

Change-Id: I4fb32347122f226597ae17180fbcbca81013a9b0
(cherry picked from commit 6a109d11b848c56a1e555416f0e7691ea60b433c)