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

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