am 39624127: Merge change 4685 into donut

Merge commit '39624127845afcf2876cc2c09cc11c06fcf0f57b'

* commit '39624127845afcf2876cc2c09cc11c06fcf0f57b':
  SDK Updater: use separate license node in XML. Support extra packages.