Merge "Fix benign unsigned integer overflow"