Merge "Always use unsigned char" into nyc-dev am: a1408f8c72 am: e7ddce7ebf
am: d8f2f5aeef

Change-Id: I04a8a78b4ea25c7302b0b7b68534cc3698ffe8d9