Don't reset orphan hash until new result

Change-Id: Ib506e7f81fe90efdb80a087323c10dedbb7ed84e
Merge "Don't reset orphan hash until new result"