Merge "Fix benign unsigned integer overflows in loop conditions"