recovery updates

Change-Id: I9e4a67e34a6fcd6b44c5e11dd32cd976b1a156ae