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

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

Change-Id: I97b75eeeb75965592f6c01eb514ae10553f34847