Merge branch 'master' into devel 81/201181/1
authorjingui.ren <jingui.ren@samsung.com>
Mon, 11 Mar 2019 07:15:21 +0000 (15:15 +0800)
committerjingui.ren <jingui.ren@samsung.com>
Mon, 11 Mar 2019 07:16:02 +0000 (15:16 +0800)
Change-Id: I2df0a8602e86fb3c705515dbe3a30ec243e6f160
Signed-off-by: jingui.ren <jingui.ren@samsung.com>

Trivial merge