Merge change 2121 into donut

* changes:
  SDK #1800921: Packages the Windows SDK in a temporary location.