am 906e6529: Merge change 2300 into donut

Merge commit '906e6529fce5e5c4473d9bcdb05c03b13dac2b8f'

* commit '906e6529fce5e5c4473d9bcdb05c03b13dac2b8f':
  SDK Updater: some refactoring and some new features.