Recover source hash failures on other source operations. am: 77ab7bdf2d am: 240c2b8782
am: e7f89bf4a6

Change-Id: I4a8a217b116993e6207ec7d12b7843b41d143c26