Move recovery init to common

Change-Id: Ied88db6252ddc8192dddba2e0489e8f2fdb64ab5