Merge branch 'master' into devel 68/201168/1 submit/devel/20190730.052124
authorbiao.wang <biao716.wang@samsung.com>
Mon, 11 Mar 2019 05:34:43 +0000 (13:34 +0800)
committerbiao.wang <biao716.wang@samsung.com>
Mon, 11 Mar 2019 05:36:14 +0000 (13:36 +0800)
Change-Id: If68ea6ee7ec027a00d1752f490e935c61f0c2f55


Trivial merge