Merge "Rollback flags: handle cases where flag values are negative"