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

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