Merge "recovery: preserve recovery logs across cache wipes"