Merge "recovery-persist: pick up both pstore console files"