Merge "Add persist.rollback.is_test (6/n)"