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

Change-Id: I9080d1f7558012cfc11524b0ab1165d7049f8db9