Merge remote-tracking branch 'origin/master' into tizen
authoradmin <tizenapi@samsung.com>
Mon, 17 May 2021 15:56:08 +0000 (15:56 +0000)
committeradmin <tizenapi@samsung.com>
Mon, 17 May 2021 15:56:08 +0000 (15:56 +0000)

Trivial merge