String16: remove integer overflows
am: 0e5fbea01c

Change-Id: I60af627000e8c8d4ad44dfafcfdea772afad3838