Merge "Fixed crash issues" into devel/master
authorHeeyong Song <heeyong.song@samsung.com>
Thu, 7 Sep 2017 04:48:48 +0000 (04:48 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Thu, 7 Sep 2017 04:48:49 +0000 (04:48 +0000)

Trivial merge