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