Merge remote-tracking branch 'origin/devel'
authorbiao716.wang <biao716.wang@samsung.com>
Tue, 21 Jul 2020 02:42:48 +0000 (11:42 +0900)
committerbiao716.wang <biao716.wang@samsung.com>
Tue, 21 Jul 2020 02:42:48 +0000 (11:42 +0900)
Change-Id: I4e628a40ccc6472556eaeda96886c98a106a7349


Trivial merge