Merge "Doc updates according to DOCS project"
authorYujun Zhang <zhang.yujunz@zte.com.cn>
Tue, 16 Aug 2016 05:53:37 +0000 (05:53 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 16 Aug 2016 05:53:37 +0000 (05:53 +0000)

Trivial merge