Merge "Fix race condition is commitCheckpoint" am: 1059810759 am: 556bd755e6
am: 86bc2a32d8

Change-Id: Ie255d33f5f6efd049c0a3e8a619c1333069c0e8c