Merge "Switch Checkpoint health sleep time to ms." am: 32a8a47b07 am: e6db7e0a23
am: 2cc8752935

Change-Id: I125122b44009e2cb11e7cf6c147c9a808a87b8a2