Signed-off-by: Njiyong <jiyong@huawei.com>
Change-Id: I9dd89324d9e53abcdf4552d791f34b001215c4ee

Change-Id: I889e58c6b4d317b4af0f5cc6723f90700d31fcc7