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

Change-Id: Ie80a3c123a5d30915cade7ddc1aad2d790476448