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

* commit '497b74d5a28d9471566159535038e454ffa15857':
  Check partition hash before resorting to block_image_verify