Merge "Fixes required after https://review.tizen.org/gerrit/#/c/189231/" into devel...
authorDavid Steele <david.steele@samsung.com>
Mon, 17 Sep 2018 17:42:23 +0000 (17:42 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Mon, 17 Sep 2018 17:42:24 +0000 (17:42 +0000)

Trivial merge