Merge "Remove use of map-wrapper in adaptor" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Fri, 18 Aug 2017 09:16:56 +0000 (09:16 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Fri, 18 Aug 2017 09:16:56 +0000 (09:16 +0000)

Trivial merge