Merge "Fix some CppCheck errors" into devel/master
authorDavid Steele <david.steele@samsung.com>
Tue, 1 Aug 2017 12:07:36 +0000 (12:07 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 1 Aug 2017 12:07:37 +0000 (12:07 +0000)

Trivial merge