Fix compiler warnings due to unused variables and comparissons between
signed/unsigned.

Change-Id: I664733c0b4f41ed9034c63b0f5b93492bb7fb616