update code from wagner Signed-off-by: houhaoyu <houhaoyu@huawei.com> Change-Id: Id554e2c583d073eaae76b1201e9422fed135c7ae