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

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

Change-Id: If9b85c1c1a316b18af92b23fca2ffd0c14f7eb6a