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

Change-Id: I4f4e8193bb39df140ed2fb6d0386002c80c39cda