am 8a8da96f: am cb9ace32: (-s ours) Merge "Do not use block_verify on target-files where feature is missing."

* commit '8a8da96fb4f107e3f7330c8f4d9576b38ae9ca69':
  Do not use block_verify on target-files where feature is missing.