Merge "fs_mgr: Support checkpoints"