update for recovery

Change-Id: I878166ea243d487abc97a0a334e28e6ff557e8ec
Fix up recovery

Change-Id: I7d5a9caab74bb6a5efc521a6a04ef0269626b91e