Merge branch 'upstream/1.16' into tizen 74/258674/1
authorHaesu Gwon <haesu.gwon@samsung.com>
Mon, 24 May 2021 04:57:08 +0000 (13:57 +0900)
committerHaesu Gwon <haesu.gwon@samsung.com>
Mon, 24 May 2021 04:58:58 +0000 (13:58 +0900)
Change-Id: I0df192ed0115e85ebfd14d678e3ff44345b03286


Trivial merge