Merge "Fix signed vs unsigned comparison."