Avoid unary minus operator applied to unsigned type Change-Id: I6986cd2b0ea236e0129ee94c02275593c287a87d