am 0985ac04: Merge "Maybe fix issue #8620910: Win_sdk build failed and unable...
am 0985ac04: Merge "Maybe fix issue #8620910: Win_sdk build failed and unable to create..." into jb-mr2-dev
* commit '0985ac04':
Maybe fix issue #8620910: Win_sdk build failed and unable to create...