Merge "Code cleanup: StagedRollbackTest (4/n)"