Merge "Replace ambiguous cmp operator with cmpl."