Merge "remove code for original block OTA mechanism"