am ba2c2a8c: am cb2d0c5a: am 7015b3be: Merge "TypeHelpers.h: Don\'t underflow unsigned int"

* commit 'ba2c2a8c70f6838f37cb891c189f4e239bcc9036':
  TypeHelpers.h: Don't underflow unsigned int