Merge "fs_mgr: support upstream dm-verity without error correction"