Merge "Error correction: Use block_image_recover in block OTAs" am: fe4e86c7fd
am: a25cced65f

* commit 'a25cced65f3418b86ba7c3707f29838f4794f8b6':
  Error correction: Use block_image_recover in block OTAs