am e7b2a436: (-s ours) am e551055e: Merge "Fix signed/unsigned comparison warning"

* commit 'e7b2a43638956250d329a9ddb4eda21cd0a16ac7':
  Fix signed/unsigned comparison warning