Merge "Error correction: Use block_image_recover in block OTAs"