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

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