Merge "Add a expansion functionality"
authorJustin chi <chigang@huawei.com>
Wed, 28 Sep 2016 02:13:20 +0000 (02:13 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 28 Sep 2016 02:13:21 +0000 (02:13 +0000)

Trivial merge