Merge remote-tracking branch 'origin/devel' submit/trunk/20201203.143330
authorbiao716.wang <biao716.wang@samsung.com>
Thu, 3 Dec 2020 06:31:53 +0000 (15:31 +0900)
committerbiao716.wang <biao716.wang@samsung.com>
Thu, 3 Dec 2020 06:31:53 +0000 (15:31 +0900)
Change-Id: Ib9b90966826ed8e020f53af9b42e0056bf3c3f9e


Trivial merge