Merge remote-tracking branch 'origin/devel' submit/trunk/20201105.154530
authorbiao716.wang <biao716.wang@samsung.com>
Thu, 5 Nov 2020 05:55:28 +0000 (14:55 +0900)
committerbiao716.wang <biao716.wang@samsung.com>
Thu, 5 Nov 2020 05:55:28 +0000 (14:55 +0900)
Change-Id: I0b851a3b3eb8f14c739678f595314cf8364b5f2b


Trivial merge