Merge "Fix race condition is commitCheckpoint"
am: 1059810759

Change-Id: I3cb7931ee01d208cb6f5f435aa5fc40cacd78b65