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