Merge "Fix a couple sign-comparison warnings."
am: 422359aad4

* commit '422359aad4dee6018001b18e16ac8af6101ee509':
  Fix a couple sign-comparison warnings.