Merge "fs_mgr_verity: support updating actual block device path in verity table"