This reverts commit 487cd50bbe2cd30aedfcb35fda706061c05628e9.

Change-Id: I03d4dcc6246c1037abc8afc34ddec50ba0a8451f
Reviewed-on: http://mgit-tm.rnd.huawei.com/5004161Tested-by: Npublic jenkins <public_jenkins@notesmail.huawei.com>
Reviewed-by: Ngaokui 00368537 <gaokui1@huawei.com>
Reviewed-by: Nliwei 00495960 <sirius.liwei@huawei.com>