Merge "Fix some issues to fit new framework"
authorSeshu Kumar M <seshu.kumar.m@huawei.com>
Wed, 1 Mar 2017 10:14:19 +0000 (10:14 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Wed, 1 Mar 2017 10:14:19 +0000 (10:14 +0000)

Trivial merge