[automerger] String16: remove integer overflows am: d0648d8dc6 am: 9de539d0dd

Change-Id: Iaf27e11e7beb60499e8c44c8659a13a02c923cbd