Merge "fs_mgr: Support checkpoints"
am: a988b4d9ed

Change-Id: Ifec8774a28b78272005f9757370d2462da4a79d5