Merge "Report error codes in the OTA update script" into nyc-dev am: 654e4fb023
am: 97be5b9b6e

* commit '97be5b9b6ebe9f6b06f0c7423f6fdca812b7dec7':

Change-Id: I5becf0f0ef550da125dcf5ddf1640f04dbb621da