Merge "Fix position error when INHERIT_POSITION is false" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 30 Jun 2017 13:53:42 +0000 (13:53 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 30 Jun 2017 13:53:42 +0000 (13:53 +0000)

Trivial merge