Merge branch 'devel/master' into tizen
authorjykeon <jykeon@samsung.com>
Tue, 31 Aug 2021 07:51:31 +0000 (16:51 +0900)
committerjykeon <jykeon@samsung.com>
Tue, 31 Aug 2021 07:51:31 +0000 (16:51 +0900)
Change-Id: If066600666c8f184b94031e460209c0083048ec9


Trivial merge