Merge "Windows build fixes" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 28 Apr 2021 17:28:14 +0000 (17:28 +0000)
committerGerrit Code Review <gerrit@review>
Wed, 28 Apr 2021 17:28:14 +0000 (17:28 +0000)

Trivial merge