This should fix signedness warnings when compiling with MSVC.
Change-Id: I4664cce0ba91e9b42d21a86fd4a7e82f2320c451
LGTM - thanks