am bc61b566: Merge change 3545 into donut

Merge commit 'bc61b566c86b722089703b88eb887d0e4c6acce8'

* commit 'bc61b566c86b722089703b88eb887d0e4c6acce8':
  SDK Updater: fix for new archives.