Merge "Make Rollback fields private and add accessors."