Merge pull request !394 from 刘建东/master
Signed-off-by: Caoruihong <crh.cao@huawei.com> Change-Id: I0f0b6f5cff967c47acf58be133a12a0fd98f4643