Merge "improve OTA failure messages"