Merge "Support block OTA + OEM partition"