Merge branch 'master' into devel 87/201187/1 release-pylint submit/devel/20190730.052527 submit/devel/20190730.075348
authormaoxiaojuan <xiaojuan.mao@samsung.com>
Mon, 11 Mar 2019 07:47:18 +0000 (15:47 +0800)
committermaoxiaojuan <xiaojuan.mao@samsung.com>
Mon, 11 Mar 2019 07:48:14 +0000 (15:48 +0800)
Change-Id: I085b912fdf9f85cb792af2457354ebcabcf25093


Trivial merge