Merge change 21301 into donut

* changes:
  BUG 1922590 : SDK Updater, customize message for Windows preventing a directory from being renamed.