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