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


Trivial merge