Merge remote-tracking branch 'origin/devel'
authorbiao716.wang <biao716.wang@samsung.com>
Tue, 23 Mar 2021 05:22:01 +0000 (14:22 +0900)
committerbiao716.wang <biao716.wang@samsung.com>
Tue, 23 Mar 2021 05:22:01 +0000 (14:22 +0900)
Change-Id: Ia47035c9737bfa441a33682e2c31e1b222a3a21b


Trivial merge