Merge "JIRA: BOTTLENECKS-29"
authorJun Li <matthew.lijun@huawei.com>
Sat, 9 Jan 2016 03:02:06 +0000 (03:02 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Sat, 9 Jan 2016 03:02:06 +0000 (03:02 +0000)

Trivial merge