[automerger] String16: remove integer overflows am: d0648d8dc6

Change-Id: Ib1bb7df40aac5be2ff7a704038279e4768b18f88