Merge "Set up dm-verity in EIO mode instead of logging mode"