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

Change-Id: I618aaf491fb6309a3e313f4eeed62f68822f574d