Merge "Removal of unnecessary set and map wrappers" into devel/master
authorDavid Steele <david.steele@samsung.com>
Fri, 26 May 2017 17:30:30 +0000 (17:30 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 26 May 2017 17:30:31 +0000 (17:30 +0000)

Trivial merge