Merge "Rewrite testNetworkFailedRollback"