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

Change-Id: I6bdf8163227cd554901b540e3781685a79c9fdc3