Trivial: improve info harvest on guest after failure

Change-Id: I6e91c40a671633aefcde27094a22533b64d11c66
Merge "Trivial: improve info harvest on guest after failure"