Merge "Add support for block incremental OTAs"