Merge "Rebase vsperf"
authorGuo Ruijing <ruijing.guo@intel.com>
Fri, 12 Aug 2016 00:07:18 +0000 (00:07 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 12 Aug 2016 00:07:18 +0000 (00:07 +0000)

Trivial merge