recovery updates

Change-Id: Ic7dfa7ef0c90fafba20868e3eb23a75f8c6d0ab3