Merge "Add RollbackManagerService"