Move recovery init to common

Change-Id: I03ecb0631640344898208d67dedf9269a4e7aafe