Merge "Fix Argument Parsing"
authorYujun Zhang <zhang.yujunz@zte.com.cn>
Thu, 11 Aug 2016 01:59:40 +0000 (01:59 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Thu, 11 Aug 2016 01:59:40 +0000 (01:59 +0000)

Trivial merge