Merge branch 'master' into devel 97/201197/1 submit/devel/20190730.075352
authormaoxiaojuan <xiaojuan.mao@samsung.com>
Mon, 11 Mar 2019 08:30:51 +0000 (16:30 +0800)
committermaoxiaojuan <xiaojuan.mao@samsung.com>
Mon, 11 Mar 2019 08:31:28 +0000 (16:31 +0800)
Change-Id: I8e425b9db7eb1f7c82c43d92bae17ba879b433ee


Trivial merge