am 18b27966: Merge "Restrict the verification in block-based incremental OTAs"

* commit '18b27966a66a27da7b7199ab3e4351e9369cf060':
  Restrict the verification in block-based incremental OTAs