Merge "Switch Checkpoint Restore code to c style File ops"