Merge "Modify restructure"
authorGuangrong Fu <fu.guangrong@zte.com.cn>
Thu, 9 Mar 2017 03:10:16 +0000 (03:10 +0000)
committerGerrit Code Review <gerrit@open-o.org>
Thu, 9 Mar 2017 03:10:16 +0000 (03:10 +0000)

Trivial merge