Merge "Fix the empty checkpoint timeout." am: 7d863344e9
am: 29a44ce6d7

Change-Id: If472888ac12684f83840d92617b5b7e2e0dec5b5