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

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