Merge "String16: remove integer overflows"