Merge "Fixed many issues." into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 28 Jul 2017 10:57:24 +0000 (10:57 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 28 Jul 2017 10:57:24 +0000 (10:57 +0000)

Trivial merge