Merge branch 'devel/master' into tizen
authortscholb <scholb.kim@samsung.com>
Mon, 1 Nov 2021 08:00:50 +0000 (17:00 +0900)
committertscholb <scholb.kim@samsung.com>
Mon, 1 Nov 2021 08:00:50 +0000 (17:00 +0900)
Change-Id: I1b2a345a214da65316f8afad3418e12e7bf3609f


Trivial merge