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

Change-Id: Iedcdde19dc54a2a9ee5a1b104f1bcc9c46ca8af7