Merge "Fix Coverity issues" into devel/master
authorDavid Steele <david.steele@samsung.com>
Wed, 4 Apr 2018 14:04:47 +0000 (14:04 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Wed, 4 Apr 2018 14:04:47 +0000 (14:04 +0000)

Trivial merge