Merge "Fix OTA sideload test."