Move recovery init to common

Change-Id: Ied88db6252ddc8192dddba2e0489e8f2fdb64ab5
(cherry picked from commit 69c14b799074a85eb32f268e15e46715647b6646)