Move recovery init to common

Change-Id: I233bdef5fc004863da9c666369e16e7742e60fe1