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

* commit '6a912c14ddc39e3ef70ba2b4b484ef080ef61d3b':
  Report error codes in the OTA update script

Change-Id: I2fc44e04861523d21724d39ab7e5fa2c0d6a4af7