Merge "IO fault injection for OTA packages"