Merge "Fix compile error in MS-Windows." into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 22 Jul 2020 10:28:23 +0000 (10:28 +0000)
committerGerrit Code Review <gerrit@review>
Wed, 22 Jul 2020 10:28:23 +0000 (10:28 +0000)

Trivial merge