String16: remove integer overflows am: 0e5fbea01c am: b02e0ab211
am: 1549baa415

Change-Id: I3d528c5445b6cb0cd58f24743e6442a2aea2344a