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

Change-Id: I49d52fc1209a0c59d24ca35a81fff4fdfb8ed107