Merge "Make sure CtsCheckpointTestCases passes" am: 21799c8f7d am: a2c2182b65

am: 0496f970a3

Change-Id: I5215f7b8b82b0aa9ec598cd0d8de3848c5bef3fb

Checkpoint.cpp

@@ -344,6 +344,8 @@ static void cp_healthDaemon(std::string mnt_pnt, std::string blk_device, bool is
 }  // namespace
 
 Status cp_prepareCheckpoint() {
+    // Log to notify CTS - see b/137924328 for context
+    LOG(INFO) << "cp_prepareCheckpoint called";
     std::lock_guard<std::mutex> lock(isCheckpointingLock);
     if (!isCheckpointing) {
         return Status::ok();