am 630f7df1: Merge change 4575 into donut

Merge commit '630f7df118eb813891752821c239f853ff540a4f'

* commit '630f7df118eb813891752821c239f853ff540a4f':
  SDK Updater: Better guess for the addon folder name.