recovery updates

Change-Id: I457ec32614ec428d27905f695f6572260c1c6d33