am 891968b7: Merge change 3557 into donut

Merge commit '891968b78e9604e0c6f06c3b142bb7274c24bc5b'

* commit '891968b78e9604e0c6f06c3b142bb7274c24bc5b':
  SDK Updater: Support local archives