Test retry fails on revert

Change-Id: Ie2b85fe228ae746b76b70d5c9cc01a0cdf53d8f8
Merge "Test retry fails on revert"