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

Change-Id: I82dece7b2fe00a31810120d63902048b2ffa6e8d