Merge "Zero out blocks that may be touched by dm-verity." into mnc-dev