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

Change-Id: I13e8aa2746051b2957bac1e97c402e015e3bafd4