Also, avoid comparing values of mixed signedness. Change-Id: I9804f69c29fcb1d0a9fe4b833ef1a569738c99fd