Merge branch 'master' into devel 94/201194/1
authormaoxiaojuan <xiaojuan.mao@samsung.com>
Mon, 11 Mar 2019 08:20:51 +0000 (16:20 +0800)
committermaoxiaojuan <xiaojuan.mao@samsung.com>
Mon, 11 Mar 2019 08:21:37 +0000 (16:21 +0800)
Change-Id: Ia35787149a8a1b4a84da36fe9d16e3c70b7c4570


Trivial merge