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

Change-Id: Idb11dfdd37c5813da6676894c35acb1503199553