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

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

Change-Id: I1262752767401de633610d9516b7523ec77a4b1c