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