Move recovery init to common

Change-Id: I233bdef5fc004863da9c666369e16e7742e60fe1
(cherry picked from commit db9337d3973d3039e43647108dd128acd808309d)