Merge "add dtbo support for ota"