Merge "Implement Placeholder additional property" into devel/master
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Mon, 3 Jul 2017 00:47:04 +0000 (00:47 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Mon, 3 Jul 2017 00:47:04 +0000 (00:47 +0000)

Trivial merge