This reverts commit 91d172b1.

Change-Id: I7b7b23e9d66a337736358a2535003b2b6a6c0422
Signed-off-by: Nhuangzejia1 <huangzejia1@huawei.com>