Merge "Fix for multi-language support." into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 17 Aug 2017 15:03:04 +0000 (15:03 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Thu, 17 Aug 2017 15:03:04 +0000 (15:03 +0000)

Trivial merge