Move recovery init to common

Change-Id: I03ecb0631640344898208d67dedf9269a4e7aafe
(cherry picked from commit 2074d66622db9cab5835991ce147770c41dbb2c1)