am 00e1f003: Merge "Check partition hash before resorting to block_image_verify"

* commit '00e1f0033eede8f23ff72097c98b7fd70a4e349d':
  Check partition hash before resorting to block_image_verify