Merge "Rewrite testNetworkFailedRollback_Phase3 (1/n)"