Fix remaining sign compare warnings

Change-Id: I170b16f2e091b99f971fb518bf0106c0e92adfdd