Merge "Fix errors caused by -Wold-style-cast" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Mon, 5 Jun 2017 09:47:38 +0000 (09:47 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Mon, 5 Jun 2017 09:47:38 +0000 (09:47 +0000)

Trivial merge