resolve issue found during integration testing with real recovered files

Change-Id: I6e5b5ffe87066b1593ac1abe0d45145c0cdf4491
Merge "resolve issue found during integration testing with real recovered files"