Merge "Fix the overflow issue in Checkpoint"
am: 6492a6abf6

Change-Id: I8991fd3bbe742fb87bc26bb6831280a73a2d5afb