am 1ebf4918: Merge change 4510 into donut

Merge commit '1ebf49189c09b8480718d1cee8209103890da2e5'

* commit '1ebf49189c09b8480718d1cee8209103890da2e5':
  SDK Updater: display icons for local packages.