am 46b1b205: am da724f7a: Merge "Zero out blocks that may be touched by dm-verity."

* commit '46b1b2057d5700a03b3fa6e332a737a0ef2425ba':
  Zero out blocks that may be touched by dm-verity.