Merge "Maybe fix issue #8620910: Win_sdk build failed and unable to create..." into jb-mr2-dev