Merge "Check partition hash before resorting to block_image_verify"