Merge "Fix sign-compare warnings"
am: 567c45e10e

Change-Id: I92cdd8ce4991cb3897a6a0a732c9e4d9aef2b0b9