Merge branch 'upstream' into tizen 52/241452/1
authorHyunil <hyunil46.park@samsung.com>
Thu, 20 Aug 2020 08:35:41 +0000 (17:35 +0900)
committerHyunil <hyunil46.park@samsung.com>
Thu, 20 Aug 2020 08:35:45 +0000 (17:35 +0900)
Change-Id: I64747e2043743986156f15d883a136c4fcbc0375


Trivial merge