am 87fc0fdc: Merge change 1738 into donut

Merge commit '87fc0fdc53b5998a36e0a305518525c28db7f35f'

* commit '87fc0fdc53b5998a36e0a305518525c28db7f35f':
  add -e option to add extra commands to OTA script