recovery updates

Change-Id: I3bc235ce1e875c5a5ea8999ce4841af7faccede2