Move recovery init to common

Change-Id: Ib2630a0e57ec5e088a853641b199489c8e46e872
(cherry picked from commit 82059979d7cca81f31b863d5aa04b5ebca403860)