Merge branch 'master' into devel 77/201177/1
authorjingui.ren <jingui.ren@samsung.com>
Mon, 11 Mar 2019 06:57:16 +0000 (14:57 +0800)
committerjingui.ren <jingui.ren@samsung.com>
Mon, 11 Mar 2019 06:58:01 +0000 (14:58 +0800)
Change-Id: I1d9c559ef92f0b029412b533d35b7671af59c2a3


Trivial merge