Merge "Fix an error when overflows occur." am: 483364a7ec am: fd43e423b7 am: 7843821bf9

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1446118

Change-Id: Ic47f203a1cf67533e64e3db198ebc1a7156813ec