Merge branch 'master' into devel 93/201193/1 devel master submit/devel/20190730.075423 submit/trunk/20190927.012743
authormaoxiaojuan <xiaojuan.mao@samsung.com>
Mon, 11 Mar 2019 08:11:16 +0000 (16:11 +0800)
committermaoxiaojuan <xiaojuan.mao@samsung.com>
Mon, 11 Mar 2019 08:11:59 +0000 (16:11 +0800)
Change-Id: I4c9272b3a7f48481da93d545c448302238e59cb8


Trivial merge