Merge "Report error codes in the OTA update script" into nyc-dev