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

Change-Id: I2f30dd06dd990d33beac77466f5f1d2d82af64fb